From: Kenichi Handa <handa@m17n.org>
Date: Mon, 19 Mar 2012 04:17:50 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~394^2~4
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=e903103bbae2d7ac355977ede7282c2dae131ec8;p=emacs.git

merge trunk
---

e903103bbae2d7ac355977ede7282c2dae131ec8
diff --cc src/ChangeLog
index 2a9b46243aa,f8ae2afcde6..572d090cc05
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,8 -1,15 +1,20 @@@
 +2012-03-19  Kenichi Handa  <handa@m17n.org>
 +
 +	* ftfont.c (ftfont_drive_otf): Mask bits of character code to make
 +	it fit in a valid range (Bug#11003).
 +
+ 2012-03-18  Eli Zaretskii  <eliz@gnu.org>
+ 
+ 	* xdisp.c (cursor_row_p): Even if the glyph row ends in a string
+ 	that is not from display property, accept the row as a "cursor
+ 	row" if one of the string's character has a non-nil `cursor'
+ 	property.  Fixes cursor positioning when there are newlines in
+ 	overlay strings, e.g. in icomplete.el.  (Bug#11035)
+ 
+ 2012-03-12  Paul Eggert  <eggert@cs.ucla.edu>
+ 
+ 	* buffer.c (compare_overlays): Don't assume args differ (Bug#6830).
+ 
  2012-03-12  Chong Yidong  <cyd@gnu.org>
  
  	* eval.c (inhibit_lisp_code): Rename from